bitkeeper revision 1.279 (3f093681UVtkHSoiKBAfzF-0PPQOkA)

Oops... make sure we only revoke extents on the specified disk.

diff --git a/xen/drivers/block/xen_physdisk.c b/xen/drivers/block/xen_physdisk.c
index 4b3c9bca1c598d612abe3aeee9364051546ffe6a..8e94e3c32fae6de484f8290cebf2af1bc6682168 100644 (file)
--- a/xen/drivers/block/xen_physdisk.c
+++ b/xen/drivers/block/xen_physdisk.c
@@ -84,7 +84,8 @@ static void xen_physdisk_revoke_access(unsigned short dev,
                         list);
     ace_end = cur_ace->start_sect + cur_ace->n_sectors;
     if (cur_ace->start_sect >= kill_zone_end ||
-       ace_end <= start_sect)
+       ace_end <= start_sect ||
+       (cur_ace->device & ~0x1f) != (dev & ~0x1f))
       continue;
     
     DPRINTK("Killing ace [%lx, %lx) against kill zone [%lx, %lx)\n",